Make OpenMetrics use the RequestsWrapper #5414
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov Report
|
AlexandreYang
requested changes
Jan 8, 2020
datadog_checks_base/datadog_checks/base/checks/openmetrics/base_check.py
Outdated
Show resolved
Hide resolved
datadog_checks_base/datadog_checks/base/checks/openmetrics/mixins.py
Outdated
Show resolved
Hide resolved
datadog_checks_base/datadog_checks/base/checks/openmetrics/base_check.py
Outdated
Show resolved
Hide resolved
| 'ssl_cert': {'name': 'tls_cert'}, | ||
| 'ssl_private_key': {'name': 'tls_private_key'}, | ||
| 'ssl_ca_cert': {'name': 'tls_ca_cert'}, | ||
| 'prometheus_timeout': {'name': 'timeout'}, |
There was a problem hiding this comment.
Mean we need to update all integrations config examples?
There was a problem hiding this comment.
Yes, though they'd still work of course so no rush
datadog_checks_base/datadog_checks/base/checks/openmetrics/base_check.py
Outdated
Show resolved
Hide resolved
Codecov Report
|
| if bearer_token is not None: | ||
| headers['Authorization'] = 'Bearer {}'.format(bearer_token) | ||
|
|
||
| # TODO: Determine if we really need this |
There was a problem hiding this comment.
Determine if we really need this
Can we determine now? What's needed to answer this question? :)
datadog_checks_base/datadog_checks/base/checks/openmetrics/mixins.py
Outdated
Show resolved
Hide resolved
datadog_checks_base/datadog_checks/base/checks/openmetrics/mixins.py
Outdated
Show resolved
Hide resolved
mgarabed
reviewed
Jan 8, 2020
AlexandreYang
requested changes
Jan 9, 2020
datadog_checks_base/datadog_checks/base/checks/openmetrics/mixins.py
Outdated
Show resolved
Hide resolved
| if self._client_token_path: | ||
| self.renew_client_token() | ||
| else: | ||
| self.set_client_token(self._client_token) |
There was a problem hiding this comment.
Why changes are needed in vault ?
There was a problem hiding this comment.
It had to do with where create_scraper_configuration was called
There was a problem hiding this comment.
I mean, why
Actually, I’m not sure, why
if self._client_token_path:
self.renew_client_token()
has been moved inside the `if condition` old line 232.
There was a problem hiding this comment.
renew_client_token calls set_client_token, set_client_token updates self.http_handlers[self._scraper_config['prometheus_url'], prometheus_url wasn't set until next block
AlexandreYang
approved these changes
Jan 9, 2020
AlexandreYang
pushed a commit
that referenced
this pull request
Jan 30, 2020
* Make OpenMetrics use the RequestsWrapper * fix crio * fix kube_controller_manager * fix kube_metrics_server * fix kube_proxy * fix kube_scheduler * fix linkerd * fix nginx_ingress_controller * fix openmetrics * refactor * final refactor * fix headers * fix kubelet * add note * address reviews
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation
Standardize config for all checks